From: Juri Linkov Date: Mon, 14 Dec 2009 05:09:08 +0000 (+0000) Subject: * info.el (Info-hide-cookies-node): Before hiding a cookie, X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8932 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0152b0dbdd74ec2388af02f6056c908b8ba61dc0;p=emacs.git * info.el (Info-hide-cookies-node): Before hiding a cookie, check if it already has the `display' property added by `Info-display-images-node', and not put the `invisible' property in this case. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e89556b64f7..42e91018c26 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2009-12-14 David Kastrup + + * info.el (Info-hide-cookies-node): Before hiding a cookie, + check if it already has the `display' property added by + `Info-display-images-node', and not put the `invisible' property + in this case. + 2009-12-14 Chong Yidong * cedet/semantic/mru-bookmark.el (global-semantic-mru-bookmark-mode) diff --git a/lisp/info.el b/lisp/info.el index 1bd82efdf2a..0d7686d7585 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1446,7 +1446,8 @@ any double quotes or backslashes must be escaped (\\\",\\\\)." "\\(\0[\0-\37][[][^\0]*\0[\0-\37][]]\n?\\)" nil t) (let* ((start (match-beginning 1))) - (if (not (get-text-property start 'invisible)) + (if (and (not (get-text-property start 'invisible)) + (not (get-text-property start 'display))) (put-text-property start (point) 'invisible t))))) (set-buffer-modified-p nil)))